Version 2.0
Merge branch 'release/2.0' into develop
Back-merging 2.0 into develop