Fix Sonar Issues [RTFACT-17330]