BZ-9929: comment service work