Re #9386. Remove now-unused parameter.
Merge branch 'bugfix/9386_cppcheck_warnings' into develop