REPORTS-161 - updated after mixed merges