Merge "Sonar fix: CSRMeta.java"