(cherry picked from commit 90a33611c1cade02b5bccb8f8f11a7c58f04edee)
(cherry picked from commit 5d9b12b903023d9dfc69df4af391289c76623719)