SOS-1849

For master