Do not mark headers as required by default
Merge branch 'master' into bugs/headers-should-not-be-required-by-default