Changes between #380 and #486

No builds.