Improve compilation times

Waqar Ahmedrequested to merge
work/compile-improve into master

With this merge request, I can notice a further ~8 seconds improvement in compilation time

Merge request reports