Merge "Fix sonar issue in CSRMeta"