GH94-solved merge conflicts
GH94 - Modified DeleteAction