Merge changes I70f79400,I2f8cab37 into oc-dev

* changes:
  AOD: Adjust header to spec
  AOD: Only show actually pulsing entries