Merge "Fix license_collector"