#SCL-7175 (fixed)