Merge change 24584 into eclair

* changes:
  Add support for @pending annotation.