For ENG-5201, patch up license check