Changes between #864 and #865

No changes in any of the builds.