Merge "Try to predict the rev_id when preparing edits"