Merge pull request #563 in ZP/z-push from bugfix/ZP-1254-wastebasket-not-available-when-removing to develop

* commit 'fc9d98ee':