3.99-RC2

(cherry picked from commit 2d64441aacc547b4699fa166d34f7b8ad4ce8814)