Merge remote-tracking branch 'origin/feature/stretch' into wip/5630-11972-deterministic-builds-in-jenkins