Merge branch 'develop-version-bump' into 'develop'