Merge branch 'typetables'