Merge his patch for Bug#52044 into 5.5, and apply review comments.
Attach a file by drag & drop or click to upload
