Merge changes Ia439a16c,I5d4af103

* changes:
  Support > and < in LabelPredicate, with refactorings
  Update index tests