[minor] Add in the changes from #7