Changes between #404 and #438

No builds.