Improve crab purge, for issue #4101
Merge pull request #4108 from qunox/updatepurge

Improve crab purge, for issue #4101