Minor if to else if improvement
Merge branch 'hotfix/4007'

Close #4007
Fixes #4006
Merge pull request #4009 from PulfordJ/patch-1

Minor if to else if improvement
[#4009] improvement to logic flow

- Pull driver name once to a local variable
- use local variable for comparisons
- move elseif onto same line as closing brace of previous block (per CS)
Merge branch 'hotfix/4009' into develop

Forward port #4009