Merge from test.  (Actually these changes have been running in prod for a bit.)