NXP-10835: fix branch merge