CB-7616 partial match support for --target