Changes between #849 and #850

No changes in any of the builds.