Merge "[CPS] Fix SonarQube Violations / Improve Coverage - Recurring task"