Merge "Removed unnecessary templating and initializing internal objects with exported...