Merge pull request #9990 from lnslbrty/package/wipe