EB-7102 - Table Headers - This is the initial commit of old style headers
Merge remote-tracking branch 'upstream/master'