Merge branch 'jk/peel-ref'