Changes between #496 and #566

No changes in any of the builds.