Merge "Reduce boot time" into main