JAL-1236 TODO: fix up parser to cope with the currently defined custom header......