SOS-1120

This pull will only work on ee-6.1.x, so it will need to be back ported. Thanks.