Merge "Moving default version outside of apex package"