Merge branch 'release-1' into develop
new class added
release-2
Merge branch 'release-2'