Merge branch 'gen-types-from-rt'