Merge in develop branch

Updates develop-rc branch to be a snapshot of the develop branch.