EZP-22128: More license changes