(cherry picked from commit 9b314d6163e5448789190a2576df0daf87e5a0c3)
(cherry picked from commit 1bd4dadec89d77013be0d0ffb20fa309f6df5114)