Changes between #863 and #864

No changes in any of the builds.