Merge "Make CTS not HEH the default post Q"