SOS-1840-SOS-1845

For master