Merge branches 'pm-opp' and 'pm-general'