artf689207 : sonar violation fixes