Merge change 27078 into eclair

* changes:
  Fix generic build boot sequence.