(cherry picked from commit 84aacb071703a988eaddbc7b2033e0d7c7a0db95)
(cherry picked from commit 1706c05f931a7be63d4b9720d627609550cd16b0)