Merge branch 'pm-opp'

* pm-opp:
  opp: Don't drop extra references to OPPs accidentally