Changes between #539 and #547

No builds.