Issue #9670: merge with current