NXP-15211 integrate container with tx and datasource helpers
NXP-13009 fixup components tear down