Code tweaks
Allow core to merge vendor tabs from engines