CB-6481 addressed review notes