Merge remote-tracking branch 'origin/devel_16.1.x' into merge-16.1.1

42 jobs for merge-16.1.1 in 20 minutes and 13 seconds (queued for 7 seconds)