Add the missing changes in b96bd7fc3bb1994ae35fb5abd3b8f802702eee4f