Adding support to toggle comments