Issue #10433: merge