(cherry picked from commit dea9c5ad528f957c5cae6345e83cb935dd72c01f)
(cherry picked from commit 501d0684f8da84e1761273344b878c959dbccb42)