Merge branch '2021-07-28-build-improvements'