(cherry picked from commit c68a499ea932668004e46c80ecbc4c8cd2f21c05)
(cherry picked from commit 8c6dae1f82d7504b5d7c6c88b65dae6c1b933ed2)