SOS-1916

For master