Merge pull request #2508 from akarsakov:fix_erode_intel