Merge "[RTT] Add LCI and LCR structures"