NXP-14367 fixup tx management
NXP-14367 fixup check order