[IMP]: Improve reference terms for partner
[Merge]: Merge with Parent branch
[MERGE]: Merge with latest server
[MERGE] Sync with trunk
[MERGE][IMP] Terminology uniformisation