Merge "Modify the Out-of-Band data path" into sc-dev