Merge branch 'hotfix/3743'

Close #3743
Fixes #3739
Fixes #3740
Added missing space
Forward #3775