Merge "BUG-1690: catch wildcard InstanceIdentifiers"