Merge branch 'release/6.0'