Merge branch 'jk/unused-parameter-fixes'