Changes between #380 and #566

No changes in any of the builds.