Merge branch 'jk/create-branch-remove-unused-param'