Updates for 6.0
Merge branch 'develop'