Changes between #1416 and #1417

No changes in any of the builds.