Merge with Mainline and config changes to support user.config files