Merge "[CLAMP] Replace YAML comments with helm comments"