Merge "CPS-1526 Fix response message for PATCH operation"