Changes between #378 and #412

No builds.