Merge "diag: Add fixes for DCI"