CB-7617 partial match support for --target