Create branch to keep WIP patch for modular build.


[SVN r85883]
Modularization patch from Bjorn

[SVN r85889]