Work for 3.0.0
Merge branch 'develop'
3.0.0