Merge "Resolve the helm templates"