3.0 release
Merge branch 'release/3.0' into develop