Merge branch 'hotfix/4118'

Close #4118
Fix weird verbalization
Merge branch 'hotfix/4119' into develop

Forward port #4119