Merge "tspp: add documentation" into msm-3.0