Import latest fixup for the _pre11 release (fixing several bugs). Merging revision 1629.
Changed paths: