Additional unused parameter warning fixes
Merge branch 'feature/warningfix-unused-parameters' into merge-test

* feature/warningfix-unused-parameters:
  Additional unused parameter warning fixes