Refactoring
Merge branch 'release/release-3.0' into develop