cleanup
Merge branch 'develop' into feature/1.5.0