Raising version.
Merge branch 'release/6.0' into develop