Merge branch 'V2.6'
Merge branch 'master' into V2.6