Merge "RTT bugfixes, part 5"