merged -r5947:5965 on trondeau/regen into trunk. Fixes ticket:154 on gr_regenerate_bb...