Merge "Slightly change the "pre-N" so it's CTS-friendly."