Changes between #496 and #521

No builds.