Changes between #539 and #559

No builds.