Changes between #1395 and #1396

No builds.