Changes between #397 and #487

No builds.