(cherry picked from commit f6c1f1f52f0530cfe465365b10a5fe76989897c0)
(cherry picked from commit f8fb51af607ce30ac40900f4b493d388ed946462)