Merge "[OOF] Change yaml comment to helm comment"