Create branch to keep WIP patch for modular build.