Merge in 'release/6.0' changes