https://sonar.onap.org/issues/search#issues=AWBUkj8m-08if2a6vS1J
https://sonar.onap.org/issues/search#issues=AWBUkj8m-08if2a6vS1K