Merge "Update QS header to spec"