Port changes for #244 from master to 1.7.