#987 - Add extension manager for product/category template replacement
#935 - Consolidate utility function