Merge pull request #3033 from sraue/fallbackpower