Changes between #1829 and #1830

No changes in any of the builds.