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

Merge 12.1.7 into 12.2.x

See merge request !625
17 jobs for devel_12.2.x in 10 minutes and 51 seconds (queued for 2 minutes and 18 seconds)