[163580] Initial 2.0 changes
5 files changed