Develop rc update

This updates the develop-rc branch to be a snapshot of the current develop branch.