(cherry picked from commit a1ecc68ddfbf1a0fefc6122c114c4d9c5f8f6e0d) (cherry picked from commit 633fcbc8)