Merge "Sync manifest versions from helm charts"