Fix Sonar major violation: NPath Complexity
Merge branch 'master' into 5.6.0