Changes between #362 and #387

No builds.