NXP-10907 Fix override and dependencies management