Changes between #416 and #486

No builds.