Patch #103067 with modifications as discussed in email.
Attach a file by drag & drop or click to upload
