Backport 1.1 changes to master