Master to 12.1 rebase bugfixes