Merge changes Ia2d6f52d,I578b8257 into tm-qpr-dev

* changes:
  Remove new headers flag
  Prepare to remove new headers flag