Merge "CPS-475: Fix Sonar Qube Violations"