Changes between #412 and #486

No builds.