(cherry picked from commit 738fcaf614f1873eadc47c1cb49fe15d0eb9aa58)
(cherry picked from commit 45421a28ba6bef1e238675809a1cac1738b98c84)