Imported revision from 1.2 branch.