Merge remote-tracking branch 'origin/devel_16.2.x'

59 jobs for merge-16.2.4 in 14 minutes and 22 seconds (queued for 9 seconds)