2.0.x release

Macro-PR introducing all changes required for 2.0.x