Merges version_5.0