(cherry picked from commit d95e071bbf819e0e65d715ffe4b5675f0398ccb3)
(cherry picked from commit 0ad3f5ecdf44a16b13f1942444ab286ad8916383)