Add flattening of bundles into items.(OMS-377)