Fixed performance problem of... See merge request !265 (cherry picked from commit 8d0b673e) 13ce60f7 Fixed performance problem of...