(cherry picked from commit db35acc1f923642f1acf8666dc087f1260fb1f17)
(cherry picked from commit fe5654be1e4f55f5b315284d4d89692657bec0df)