OBS, this is what upstream-merged is based on. Will update this, then rebase upstream-merged to this before I submit.