Merge "Fix boot time regression"