NXP-11840 - fix border cases