Merge "Don't set RTT property if original connection null"