Feature/5388 avoid concurrent syncs update handler conflict