Merge branch 't/build_system_overhaul'