Changes between #398 and #416

No builds.