SOS-2456 Generated