Changes between #1831 and #1832

No changes in any of the builds.