Merge branch 'jc/thinpack' into next