Add a preprocessor flag for mainline bug #21426
E1S9.3, E1S12, E1S13: Guard against mainline bug #21426