Sync "development" branch with v0.3.1