(cherry picked from commit bb0c1cb536494f87b61e15323826cb2bbecb2099)
(cherry picked from commit 78917cd2be0d34dbbf4baab040f0cb83cec910ee)