Changes between #393 and #398

No builds.