#SCL-5324 Fixed
For SCL-5179