Updates based on merge with master.
Discard changes rewrite.

STUD-1860
Removes unnecessary PUT after DELETE