(cherry picked from commit d52cb62719f372056b75741ca0a4b207a2c1d99b)
(cherry picked from commit 9255caa48a2ac34c40be7e7e3a8a282ffa762501)