ToR RMT.0498

Reorganisation of Part 23 and CS-23