Merge branch 'header_table' into integration