NXP-13793: follow NXP-13874 recommendations