SOS-1518 6.1.x