(cherry picked from commit dd1b9306467d6ad3cfaabfb0d8d5a79c8c76404b)
(cherry picked from commit 8f3bf74e1c1689e8c04f83a2c4cf58b38c17ab33)