(cherry picked from commit 5d55e75c01c276172a6040875046a60330bd74b1) (cherry picked from commit db27e4a5)