Merge branch 'topic/pm-power-off' into next