#SCL-5369 Fixed
For SCL-1850