dellis/mshah - orc now correctly deals with upgrading in the case of a single non-swappable group