SOS-2246

see my comments in ee-6.2.x pull request