Merge branch 'fix-NXP-13268-short-annot'