Changes between #5734 and #5766

No builds.