sonar code duplication fix
excluded error message from sonar report because it will be obsolete if the Users/me will be removed
Merge remote-tracking branch 'origin/develop' into develop