Merge "Clean up namespace class resources via addClassResourceCleanup"