Changes between #487 and #521

No builds.