APD-336: New header refinements