Master rebase and fixups for deprecations.