= fixed #SCL-8070

(cherry picked from commit efd319ebfb7b2f2451870511e4b44a16b673c7e9)