Merge remote-tracking branch 'origin/master' into 840-replace-e-printstacktrace-in-unit-tests

21 jobs for 840-replace-e-printstacktrace-in-unit-tests in 11 minutes and 45 seconds (queued for 1 second)