[PLAT-5217] Handle bundles without external identifiers correctly