Merge branches 'pm-sleep' and 'pm-runtime' into pm-core