(cherry picked from commit e1ed84e5171e9e96b7f11110ec86a7825f439d1c)
(cherry picked from commit ebf023f03ad09762c8147ad8c963a51b60de62ff)