(cherry picked from commit d40ba62f49489658cfd6910345b1b7934cf8a8be)
(cherry picked from commit f443db72edc7d4706cf425bb0632b2fbf5032b82)