SOS-1846-SOS-1835

For master