finish 9.4 except delete's test on branch updating-users