Fix for SCL-7176
Tests for SCL-7176