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

Merge 12.1.8

See merge request !639
17 jobs for devel_12.2.x in 9 minutes and 2 seconds (queued for 2 seconds)