Merge "object storage: fix and cleanup header checks"