Merge "Enable ControllerExecutionBB for service scope"