(cherry picked from commit 4ac0f7ef0b98fb25c53f20c0c67f802d50f03c22)
(cherry picked from commit 4b2da3a27b01db04987003aa608c9557db76366d)