Merge branch 'devel_12.1.x' into merge-12.1.7

17 jobs for merge-12.1.7 in 11 minutes and 18 seconds (queued for 31 seconds)