Merged in custom header support changes.