upgrade optimizations for space-constrained installs, RT10071