Merge branch 'betterstartuptime' into 'master'

engine update

See merge request !204
1 job for master in 2 minutes and 32 seconds (queued for 3 seconds)