SOs-1930

For master