(cherry picked from commit a5c7c886ee9f662aaa0a7d89663639e3372dd7d3)
(cherry picked from commit 462b5b55d8c5a46adc95376378912bbf04e3fd83)