NXP-15172: add leaf control