Fix #663
Fix #662
Fix #661
Merge remote-tracking branch 'origin/development' into development
Fix #663
Fix #662
Fix #661