Merge branch 'jc/thin' into next