#Issue #2371