Merged from Kathy's 3.0.2 changes.