Merge #10206: add test for previously fixed bug.