Merge branch 't/build-improvements'