SOS-1905

For master