ENG-1805 Changed opt initialization for clarity