SOS-2156

Please take a lot off the fix and we will evaluate if we should include this in the release