Changes between #1077 and #1078

No builds.