Merge branch 'devel_12.2.x' into merge-12.1.8

17 jobs for merge-12.1.8 in 9 minutes and 22 seconds (queued for 1 second)