(cherry picked from commit f45a0b340a060ea349ebb45b5cd6d98954a7900f) (cherry picked from commit ded3fd987bf02311898515c7e4d4d857d23bf53b)
(cherry picked from commit f45a0b340a060ea349ebb45b5cd6d98954a7900f) (cherry picked from commit ded3fd987bf02311898515c7e4d4d857d23bf53b)