SOS-1595 update imports