Changes between #496 and #561

No builds.