Merge "Fix input cdex -> output non-cdex"