Merge branch 'merge-12.2.3' into 'master'

Merge 12.2.3

See merge request !759
20 jobs for master in 11 minutes and 42 seconds (queued for 1 second)