(cherry picked from commit c260ff73088ad822603ebba0d1668a16ab41e4e8)
(cherry picked from commit 838606f0e8fc900bfe5b82ffec124a21bf6a0b16)