(cherry picked from commit 4fe75d11) (cherry picked from commit a68e60f450b5be76d40627066b2c34a0e2360fab)