SOS-1831

For master