This is linked to HHH-8022, and we should handle the PS and the CS differently right from the Loader where we know if we have to deal with a CS.