Merge change 26471 into eclair

* changes:
  Fix the qualifier match algorithm.