(cherry picked from commit 226a6aa06fc46ead24e262afd382af64452ae080) (cherry picked from commit 6bff7a4172df898483dfc928c19a26ec1c6a6f0f)