Merge "Update split controller to latest extension interface" into sc-v2-dev