SOS-1826-SOS-1827

For master