Merge "Lower build requirements for controller"