Merge branch 'jc/typebreak'