merge license update, smaller issus