Merge "Glop DrawPatch support"