Merge branch 'jc/pull' into next