PIM-1601 : Make work edit view