Merge "diag: Add sanity check for data" into msm-3.0