Merge into main build system.