TypeContext Clone fix
Merge branch 'TypeContextClone'