Finish user edit, update, index and destroy actions
for cherry pick