Merge pull request #5070 in master
Increase readability, fix indentation
Merge pull request #5071 from localheinz/hotfix/readability

Increase readability, fix indentation
Merge branch 'hotfix/5071' into develop

Forward port #5071