Changes between #826 and #827

No builds.