(cherry picked from commit 9a6c40fc4a31c46099ba108226522567b14460bb)
(cherry picked from commit 73a21fd61f94215f70946580e0c75a7b8530063b)