(cherry picked from commit 454a7b329da6f8f8a86fdc93b6fa0febb8b2d641)
(cherry picked from commit 6d4328444bf52677007271663742ca9a4180e632)