Fix #604
Fix #603
Merge remote-tracking branch 'origin/development' into development