Merge changes from topic "flip_flag_v2" into tm-qpr-dev

* changes:
  Flip headers flags
  Fix vertical size when using new headers