Merge branches 'pm-opp', 'pm-misc', 'pm-avs' and 'pm-tools'