Add Klekt multi-bundle support