Forward port from 53X of update to CVS-tag V00-03-34.

Forward port of #1710.