(cherry picked from commit 7df0a93e2547155df2d93bd69e0dec16f50c684b)
(cherry picked from commit 1cd0c804616e98cf0cf738b3209352006e21a926)