8.xx issue18 eraser tool

please review