Changes between #425 and #487

No builds.