Refs #17185 - Update comment plugin