(cherry picked from commit fd5aece4be960f876e7c98e3c282be57dd1aec2b) (cherry picked from commit 13666189)