Merge branch 'research-edit-operations' into research