Patch Set 11: (4 inline comments)

Both tests cases should be fixed by change Ibec45472d5b8115e1520caa521516dea9d156b6b and I13348bc9ac621193f38ae52855354b3a866e7cbe. To be honest, I'm personally not sure if those changes should be squashed together, by I can do that if you prefer handle this such way.