Merge in develop rc1

Merging work done on develop-rc1 branch into mainline develop branch.