Changes between #857 and #858

No changes in any of the builds.