Issue #3151