#SCL-7175 (fixed)
(cherry picked from commit 7c62d68)