Merge "Modify the Out-of-Band data path"