Cherry-picked commits after 2.0.1: