Changes between #1087 and #1088

No builds.