r15018: Merge Volker's ipc/trans2/nttrans changes over