Merge branch 'hotfix/5.0.1' into develop
Updated the changelog.
Merge branch 'release/5.1'