Merge remote-tracking branch 'origin/build-tidy'