Changes between #496 and #543

No builds.