Improve startup speed in development and resolve some merge conflicts