(cherry picked from commit bcdb3b7d) (cherry picked from commit aca0b4339b3966836fcdcd9c488c45c183804dcc)