final changes before r33 rebase