(cherry picked from commit 47e04e34f6d14431a9ce1881a6dee8035ff3839a)
(cherry picked from commit a110634bae749bd3580adeb3bd65702bcf382fb0)