Changes between #1590 and #1602

No changes in any of the builds.