bring in changes from dri tcl branch