Merge "Add compare header version to test images oneserver"