Changes between #866 and #867

No changes in any of the builds.