SOS-2120

This pull request is different from ee-6.2.x