Performance improvement on startup, see #7