Added CTID reporting support (OMS-204)
Merge branch 'oms-204'