Fixed sonar violation
Merge branch 'APD-154-IMR' into develop