Merge branch 'addmetadatatoresponse' into develop