(cherry picked from commit 38b11dfe87fd99f0f56d92a2179281bb50343de9)
(cherry picked from commit 8e297f33832ed871b3639a631a5b8f02f92fa504)