Merge branches 'stagger' and 'altpower-fixes'