Changes between #392 and #398

No builds.