(cherry picked from commit 2e83e325) (cherry picked from commit 42b0bf4d3bab180876d4803fe2ec1f6e93064b28)