Merge changes Ie59a530f,I0825b3c2

* changes:
  Merge branch 'stable-2.8'
  Add submit rule evaluation tests for custom labels