Merge "[VOL-3151] - Add new filed for ONU type"