Merge "Fix sonar issue CertificationModelFactory"