Changes between #372 and #488

No builds.