Merge remote branch 'pwith/build-cleanup'