MBS-7001: Invert normal-row/header relationship for merge release edits.
Merge branch 'mbs-7001' into beta

* mbs-7001:
  MBS-7001: Invert normal-row/header relationship for merge release edits.