Resync rc1 branch to master