(cherry picked from commit 780a4972e7ddfe208c9d883fc27f7d1d08b54032)
(cherry picked from commit 79504e115f1587a29b202fd33b93b23dc69b5650)