Merge "Sonar critical fixes in MicroserviceServiceImpl"