Changes between #1827 and #1828

No changes in any of the builds.