CSIT failed after merge, must investigate and solve it for M2/3
SDC-2732 fix CSIT
SDC-2731 Sanity API Test - xpath expression is incorrect