Merge branch 'stable-2.5'

* stable-2.5:
  Fix test-submit-rule.