Changes between #986 and #987

No changes in any of the builds.