Changes between #374 and #487

No builds.