Improve header handling, closes #2370
Improve header handling, closes #2370

quails4Eva/NSwag,quails4Eva/NSwag,RSuter/NSwag,RSuter/NSwag,quails4Eva/NSwag,RSuter/NSwag,RSuter/NSwag,RSuter/NSwag,quails4Eva/NSwag