Changes between #996 and #997

No changes in any of the builds.