[BUILD] - Minor performance improvement on boot
[BUILD] - Minor performance improvement on boot