Merge "AbstractResourceManagerFactory Clean Code Hygiene"