Issue #1127