(cherry picked from commit 2273a74c1f3895163046cca09ff5e983df301d22) (cherry picked from commit 9e17ffe599e12c59c48f4355de645c31a4735d04)