automerge: 9a8351d * commit '9a8351d9d7d1e002187fca20fea48d1e9214d829': Treat optimistic addresses as global preferred.