Merge changes from topic "bumping-api" into pi-dev

* changes:
  Finalizing P SDK
  Finalizing P SDK