Merge changes Id60fd5ee,I4c7b68ad into nyc-mr1-dev

* changes:
  QS Header: post some updates to the header
  QS Header: don't update everything unless we need to