Changes between #486 and #507

No builds.