(cherry picked from commit f2b1142018fd64dd45ec97f1eccf0c48cc4a8c6d)
(cherry picked from commit b9150e82be712b2cd82d689f0f26c2a133564701)