SOS-2285

Master is different from 6.2.x