Refs SNP-836. Add an opt-in, guarded Compose repair and tests without enabling unrelated queue consumers.