Merge remote-tracking branch 'origin/devel_15.1.x' into merge-15.1.3

41 jobs for merge-15.1.3 in 16 minutes and 41 seconds (queued for 8 seconds)