Fix for #4175
Fix indentation
Merge branch 'hotfix/4376'

Close #4376
Merge pull request #4379 from superdweebie/fix-4175

Fix for #4175
Merge branch 'hotfix/4379' into develop

Forward port #4379