Add assignee setter, merge