Another round of merges from 3.0: