Add product_tabs hotspot
Fix core conflict on base product
Support auxiliaries in TermsHelper