DONT MERGE -  HD-12 hive client skipTrash feature

DONT MERGE.
This is pull request is created just to review changes.