*8604* Move common submission header code to lib