Changes between #372 and #486

No builds.