Merge 'release-5.0.0-24' branch into 'develop'
committing releaseVersions file and other source changes
Merge 'release-5.0.0-25' branch into 'master'