(See Issue #18365)