am d71b9154: Merge "Don\'t use bootstrap loader directly"

* commit 'd71b9154daf796a03aebf2d38c60197cf77e0133':
  Don't use bootstrap loader directly