Changes between #539 and #554

No builds.