Merge branch 'devel_12.2.x' into 'master'

12.1.8 into master

See merge request !640
17 jobs for The_Refactoring in 10 minutes and 37 seconds (queued for 1 second)