Merge branch 'release/2.0.0'
Update .sami.php
Update .sami.php
Merge branch 'hotfix/2.0.1' into develop