Changes between #496 and #525

No builds.