SOS-1817

For master