Resetting version
Resetting version
Merge branch 'release-6.1.0' into develop