SOS-1518

6.1.x CE Backport. It is exactly the same as 6.2.x CE