Feature nxp 14388 override refactor