For SCL-5283.
EA-40274
#SCL-5430 Fixed