Core changes to comment templates