Merge power-supply 'fixes' branch