Merge branch 'develop'
Merge branch 'develop'
Version bump for release and minor fix