PARTNER-2096

PARTNER-2096