Merge "Add a response header validation"