(cherry picked from commit 6ed9d362242d36bfae4083bf3b1c2eb32fbb2f72) (cherry picked from commit 9289f4527d8fc3418fdeb8bf213b0f62525092d5)