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