NXP-15782: post release 6.0