Changes between #997 and #998

No changes in any of the builds.