(cherry picked from commit 6c0cadcf9d0dad48a065598ff57b4bde1e135fcd)
(cherry picked from commit fce39c847b046ec8b3f11a83f1e809a4a88100d6)