(cherry picked from commit 19a7f37eface2c2f87c39fc6c04491f46e273d09)
(cherry picked from commit 67ddf4a5b8c4914f1fd06e96470b271edcdfb1a3)