SOS-2485 Auto generated