(cherry picked from commit c4b2eb776ccb95532ef4fea9503ac3bb7acb17b8)
(cherry picked from commit 6ca7f9fe7a88c37fd873b2f3d419b9fc8c86bd12)