Merge "Add centralized manila control classes"