Merge branch 'no-pred-ty'