Most of the changes are in already, but we referenced these commit hashes from 20.03, so let's include them in the history.
