(cherry picked from commit a6541b26e510bc2d966c031d3808ed8a0e851c13)
(cherry picked from commit 914f7c0a0d710d53dcf3b62cecfac8002ed3c65f)