Create 2.0 release

Including #40195 (closed) and maybe #40197 (closed)