Merge controller updates from gb2