APD-336: New header, reopen issues
APD-336: New header refinements