(cherry picked from commit 73bb2102ce4b82b3a3bed91319f7c8f067ddc3e8) (cherry picked from commit 859aa1f9d621d07693825e610bdc0149f7a2770a)