Change process from find_or_create find_by in deleting a data
Merge branch 'MH-771b' into dev