BL-678 delete from wrong bucket

Duplicated change in master
Merge remote-tracking branch 'origin/Version2.0'