Issue #517 completed.