Helper to drop stashed data
Merge branch 'master' into work

* master:
  Helper to drop stashed data