Fix #622
Fix #621
Fix #619
Merge remote-tracking branch 'origin/development' into development
Fix #622
Fix #621
Fix #619