Partially updated  19210 patch.