SSP-688

Pulling in the fix for SSP-688