Merge "Fix sonar issue CertificationController"