Changes between #441 and #486

No builds.