afdb094380
Reason: Bring in upstream modifications, so the pending changes which depend on them can be queued.
Reason: Bring in upstream modifications, so the pending changes which depend on them can be queued.