Merge branch 'hotfix/2.1.2'
Reset assembly name
Merge branch 'hotfix/2.1.3' into develop