= fixed #SCL-8044

(cherry picked from commit df6994de797ac561f8405cffcceeb9a25259ce04)