Merge "Updates to allow version control and SO profile"