Updating to latest core
Merge branch 'release-5.0.0'