Merge branch 'release/v2.0.0' into develop
Final commits for project completion
Merge branch 'develop'