Issue #3129