forward-port the things we learned on the release-2.1 branch