avoid some redundant upgrades, #18548