GUEST-1557: Salsa

Owned by DELPHI