Merge "Support header versioning in dm-bow"