Merge branch 'hotfix/2.0.1' into develop
Add better default options for the form
Merge branch 'release/2.1.0'