SOS-1813

For master