Merge branch 'hotfix/4759'

Close #4759
Fix conflicting use statement
Merge pull request #4762 from davidwindell/patch-12

[Hotfix] Fix conflicting use statement
Merge branch 'hotfix/4762' into develop

Forward port #4762