Changes between #522 and #544

No builds.