SOS-1573

Please backport this to ee-6.1.20. This is a bug