Merge "Update VersionParser"