Merge "Fix issue #6054627: resource matching issue of size qualifiers"