Issue #3084