SOS-2007

For master. ee-6-2-x pr is different.