Merge.
s/Future/Promise/g, remove "upgrade" and "replaced" event vestiges