Merge "RTT logging tweaks"