Merge branch 'pm-opp'

* pm-opp:
  PM / OPP: Export opp_add()