(cherry picked from commit 5479a6b885a3f992678b448031631dc5815f901b)
(cherry picked from commit 6c9d56808bf0bfaf41dac47ccfbc6cc361e59695)