Changes between #380 and #539

No builds.