Merge change 23761 into eclair

* changes:
  Fix compilation of add-resource tag.