Merge "Fixes sonar issues in API_Artifact"