More fixed and performance improvements #SCL-5472 Comment
Bug with introduce variable fixed
#SCL-6024 fixed
(cherry picked from commit 4b7ec54)