NXP-10842 revert expired field mappings suppression