(cherry picked from commit 9dd224f00c02151642523f31c98b819a2ea9b1b7) (cherry picked from commit 710af007bccb62c65dd51ae46c77a297c0c58e43)