Fixing relationship between stapler and type
Merge branch 'refacto-staplertype'