(cherry picked from commit c55446003d7457a02467f9808bd24f7325ba91d6)
(cherry picked from commit 44c4d7b9521fe449e61edc614446195861932f8c)