Issue #3120