Merge branch 'hotfix/4117'

Close #4117
Fix name of variable used for capturing output when executing a shell command
Merge branch 'hotfix/4118' into develop

Forward port #4118