(cherry picked from commit 56a0c175082b2b62698f65c1769a64224b3fb821) (cherry picked from commit 02d4a1fce3eb1ec9d5479add9e6498f682ac4311)