(cherry picked from commit 3ccc7d07) (cherry picked from commit ee0abc08) (cherry picked from commit ae14ca00)