Changes between #1397 and #1398

No builds.