Merge branch 'tvar_playground' into 2397_tvars2tvar