(cherry picked from commit eb08a2a33edb37b781d72efc0e850c0645da8bd6)
(cherry picked from commit 7c391bd2365209d58d74f6a462cd94885a92da31)