r6354: merge from 4_0 rev 6353: