Merge "Remove incompatibility between VT and RTT"