IDEX-1170; IDEX-1171: rework delete/rename item functionality
Merge with remote branch master
IDEX-1170; IDEX-1171: rework delete/rename item functionality