Fix api due to sonar changes in common