Updated bundles
Added merlin support again