Changes between #414 and #487

No builds.