ENG-16 upgrade bootstrap