Issue #2564