Merge "tspp: Improve data-path handling"