NXP-13287: Move leaf children to node content