Rebased 924996 patch