Fixed performance regression #SCL-7464 Fixed