Merge branch 'next-release'
3.6.0