Changes between #825 and #826

No builds.