(cherry picked from commit 9cb1cb4b4ddb4482ef980315d80be3cdbd704a74)
(cherry picked from commit 56b0783492b9f36169a516ce1e6713311261e6d7)