Merge "Fix function helm index"