Port existing configuration to new style build
Update from upstream production version