Returning correct response type
Merge remote-tracking branch 'origin/Testing_Release_1.2' into Testing_Release_1.2