Merge "Fix license_type. GPL"