NXP-13369: to be removed to be removed once 3.3.1.GA-NX9.02 released and used