Changes between #496 and #514

No builds.