(cherry picked from commit 512e8a0fc3422346c10cd14c2f5dd49fe70bc0c1)
(cherry picked from commit cb59f86f2473161e1f9e18dec2d3c41c923b864a)