Shouldn't those changes also be reflected in the upgrade step?
Same in `EventPage.xml`