EDOC-1618: adding comments