Changes between #486 and #539

No builds.