CodeMerge-2

Included genericresponse.cs