First development on v2 features for teamA
Final release 2.0 update from teamA
Merge branch 'teamA'