Merge "CAS: Fix memory leak in FactoryLoader"