Merge 1.7. Forget about Tcl < 8.6 for this branch