Fix/headercheck next

Merged Timo Koch requested to merge fix/headercheck-next into next

Merge request reports