Merge branch 'release/5.0.1' into develop
Minor updates
Update version
Merge branch 'release/5.0.2'