Merge branch 'release/2.0.0'
Fix for notice
Merge branch 'hotfix/notice' into develop