(cherry picked from commit 997dd097f1ff256bffc42dd730ceab9be671206a)
(cherry picked from commit 909389d70db319e724a5b32b23a668cab598f116)