Changes between #5734 and #5769

No builds.