Fixes #675
Fixes #679
Fixes #672
Merge branch 'develop'