Changes between #1409 and #1410

No builds.