Merge "FP2-1641: Booting is too slow" into fp2-dev-v2