Changes between #373 and #378

No builds.