MISC update
Update for starter
Fix test
Squash for 2.0.0-beta2
Squash for 2.0.0
Merge pull request #1 from ventoviro/staging

Sync from Main