Merge branch 'jn/thinner-wrapper'