Merge change I10073d50 into eclair

* changes:
  Add Annotation for optional features.