Feature/headercheck

See merge request !3064

(cherry picked from commit 5d0f02e0)

50208e7a [headercheck] add missing headers