Merge branch 'master' into 1150-build-return-exit-code
Fix merge issue