fix for #3373
Merge pull request #4123 from bartmcleod/fix#3373

Fix#3373
Merge branch 'hotfix/4123' into develop

Forward port #4123