Develop cherry pick

Cherry pick missing changes from the subversion release branch.