Fixes (at least some) of the recursive power-drain crash issues.
Merge pull request #7464 from Zuhayr/dev-freeze

Fixes (at least some) of the recursive power-drain crash issues.