Backporting the patch and the test case fixed as part of BUG#16041903 and BUG#19683834 respectively.
Attach a file by drag & drop or click to upload
