Merge branch 'release/2.6.0.2'
Merge branch 'release/3.0.1.0'