Merge branches 'pm-core', 'pm-opp' and 'pm-qos'