Power Event Update
Merge remote-tracking branch 'origin/jb-mr1-mod' into jb-mr1-mod