Merge license changes