First revision on our v2 development
Merge branch 'teamB'