Merge "Split HA and NOHA scenarios into 2 tables in reporting"