Fix power failure compile error
Merge branch 'master' into New-map