Fixed SOE #SCL-5372 Fixed