[Regression] Increased execution times with version 1.7 compared to version 1.3

[Regression] Increased execution times with version 1.7 compared to version 1.3 #1022