Merge branch 'release/2.4.6'
Merge branch 'master' into develop
Bumped changelog
Merge branch 'release/2.5.0' into develop