(cherry picked from commit 91c43f3978fa7c8341550b9ca279e460ba7e74e6) (cherry picked from commit 373cbfc8)