NXP-10598 fix datasource publishing (usage leaks)