(cherry picked from commit ef15f7360784c5ec7341f3e4856a759cf1e2aedb) (cherry picked from commit 802600b1)