Changes between #1828 and #1829

No changes in any of the builds.