r1383: sync from 3.0 tree