Issue #1945
Removed majority of the logic from the template to the Comment Class