Changes between #856 and #857

No changes in any of the builds.