Expedite: Applying same patch as the one I put for sdl engine on September 7th.