Changes between #373 and #487

No builds.