Merge remote-tracking branch 'origin/devel_16.0.x' into 1533-background-order

43 jobs for 1533-background-order in 31 minutes and 55 seconds (queued for 53 seconds)