(cherry picked from commit af793fec0ae66dfec9beaa5ab73393074b1b8767)