Changes between #1420 and #1421

No builds.