#3411 maybe it needs a bundle version