Merge "[PMSH] Finalise API"