Site-1871: Enabling comments