Merge "Use HttpStatus::header instead of manually crafting header()"