Changes between #522 and #539

No builds.