(cherry picked from commit 2c12d973ef67f16cb250f35f5034cad6e8c01a82) (cherry picked from commit 23602cfbb3313e719af8bf20a4b047949992658a)