(cherry picked from commit 691bc959) (cherry picked from commit c392147aaa4c7fde0d36c33bf0496d43ae2ce477)