am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"

* commit '0de2351e6a6be685e1d68661dcf5f4902898cacd':
  Don't remove existing explicitly stashed blocks