Fix #466
Fix #628
Fix #633
Merge remote-tracking branch 'origin/development' into development