Merge "cargo_embargo: additional license selection" into main