SOS-1582, SOS-1689, SOS-1724, SOS-1618

For 6.2.x CE and 6.1.x CE