Merge "Fixed sonar issues in CSRMeta class"