(cherry picked from commit 09913ad57fd360c0ec1eacc43af842f30b8c2cc9) (cherry picked from commit c20ea2ac)