Sync (master) yet again
Rework header recognition to make renderer testing happy