Changes between #861 and #862

No changes in any of the builds.