Merge from vendor branch TCSH: