(cherry picked from commit 3b34f73cb3c302aeb5f92cbddda0257da5b4a726)
(cherry picked from commit 1fa6b5bb51f532db0eefeec1b66ef06fa8a0f536)