Header should be a diagnostics one.
Merge branch 'develop' into release-4.4.0