am 0628fa25: Improve boot time

* commit '0628fa25141261e549f06d1c6f9e9f3d29e2b8f0':
  Improve boot time