Merge branch 'build-rework'