I'd prefer to have this in a separate upgrade step, because this upgrade step is already in master (and thus might be already installed) and this is an "atomic" change.