(cherry picked from commit ada0992f7398f4bf00a9a61358808775a3ca1693)
(cherry picked from commit 92730ce6f41bbe77276ef28a7a20dbc9d904baa1)