Merge "Fix ControllerExecutionBB flow."