Bug 876623 - Add some tests for bug 867045
Merge pull request #10036 from crdlc/bug-876623

Bug 876623 - Add some tests for bug 867045