ENG-4819 ENG-5102 licensecheck fix