Changes between #436 and #501

No builds.