Merge "Fixed generic Sonar issue in the clamp project"