Issue #557 completed.