forward-port the 2.10.0 upgrade instructions