Compile hotfix for master
Merge branch 'master' into system_power