Small visual fix
Merge branch 'hotfix-2.3.18' into develop