Merge "Add owners for controls"