Refs #21007; Added upgrade step