Merge pull request #1820 from shackbarth/wipe_early