Double escape on special chars - frequently used questions

When creating a frequently used question that has special chars, those special chars are being escaped twice - this is because they are used with a mustache template

STEPS TO REPLICATE
Log onto Moodle Site
Navigate to a course
Create a new assignment/advanced forum that uses marking guide
Define marking guide if needed.
Add frequently used comments that contain special chars.
View assignment/advanced forum in Joule Grader/Moodler Grader.
View the Frequent Comments.
OBSERVED BEHAVIOR:
Special characters are not displayed. The HTML code for the characters are displayed.
EXPECTED BEHAVIOR:
The HTML Code should not be shown it should be the actual special character that is being displayed.

Reason for bug:

grade/grading/form/guide/renderer.php

class gradingform_guide_renderer

public function criterion_template

$commentoption->description = s($comment['description']); <- escaping prior to template