SI-8270 tries both macro bundles and vanilla objects