Don't overwrite header data
Merge branch 'develop' into release/airbp