ENG-7060: fixes and license updates.