Merge "Fix sonar issue KeyPairFactory"