(cherry picked from commit bf1ddd1c9137578b86895577d5b80e0c5771b605)
(cherry picked from commit b9150e82be712b2cd82d689f0f26c2a133564701)