Merge "[RTT2] Add time-out & clean-up code"