Merge "RTT initialization bug fixes"