Additional test for this case.
Rename branch, I typo'ed it to bug25870.
Merged bug25780 into stable