(cherry picked from commit f7b195b226308e4f016817a1bba5ca1a52921906)
(cherry picked from commit a75720ec0646f4fe5bdf21126bd5c3cf719170e9)