version bump
clean up
Merge branch 'feature/v1.5' into develop