3.99.1-RC1

(cherry picked from commit c254315cb13899896b78068c639137ba37e8aed8)