Merge branch 'release/3.0.5'
Merge branch 'develop'