Changes to pr

Please rebase these into a single commit on CB master