Fixed a problem with querying sets introduced with the new
querying-members-in-collections feature.
Merge remote-tracking branch 'upstream/master' into v16x.