Merge "BUG-1281: optimize ControllerContext"