Patch file for ticket #11006