Merge branch 'typedef_checks'